Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[peripherals] remove inclusion of android specific header #15827

Merged
merged 1 commit into from Apr 2, 2019
Merged

[peripherals] remove inclusion of android specific header #15827

merged 1 commit into from Apr 2, 2019

Conversation

olafhering
Copy link
Contributor

Most of the changes to generic code in commit
9e1f93a was guarded by TARGET_ANDROID.
Just that one header file was forgotten.

Build-tested on x86_64-Linux.

Signed-off-by: Olaf Hering olaf@aepfle.de

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@yol yol added Type: Fix non-breaking change which fixes an issue Component: Input v18 Leia labels Mar 28, 2019
@yol yol added this to the Leia 18.2-rc1 milestone Mar 28, 2019
@garbear
Copy link
Member

garbear commented Apr 1, 2019 •
edited

Android code shouldn't be mixed with generic peripherals code. I actually fixed this in commit 66c9cbf of #10309, so the android header here can be removed entirely.

@olafhering
[peripherals] remove inclusion of android specific header
23310ce 
This header is not needed anymore after commit 66c9cbf.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
@olafhering
Copy link
Contributor Author

I updated the pull request, lets see what Jenkins says.

@olafhering olafhering changed the title [peripherals] wrap inclusion of android specific header [peripherals] remove inclusion of android specific header Apr 1, 2019
@Rechi Rechi merged commit d136a0e into xbmc:master Apr 2, 2019
@olafhering olafhering deleted the PeripheralBusAndroid branch April 2, 2019 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garbear garbear garbear approved these changes

@yol yol yol approved these changes

Assignees
No one assigned
Labels
Component: Input Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Milestone
Leia 18.2-rc1
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@olafhering @garbear @yol @Rechi